Fix loading initial theme

TortugaPower · May 23, 2023 · e7782f2 · e7782f2
1 parent 6f24b9d
commit e7782f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/BookPlayer/Coordinators/MainCoordinator.swift b/BookPlayer/Coordinators/MainCoordinator.swift
@@ -63,7 +63,8 @@ class MainCoordinator: Coordinator {
     tabBarController.modalTransitionStyle = .crossDissolve
     presentingViewController = tabBarController
 
-    if let currentTheme = libraryService.getLibraryCurrentTheme() {
+    if var currentTheme = libraryService.getLibraryCurrentTheme() {
+      currentTheme.useDarkVariant = ThemeManager.shared.useDarkVariant
       ThemeManager.shared.currentTheme = currentTheme
     }
 

diff --git a/BookPlayer/Settings/Themes Screen/ThemeManager.swift b/BookPlayer/Settings/Themes Screen/ThemeManager.swift
@@ -86,7 +86,10 @@ final class ThemeManager: ThemeProvider {
     guard
       let sceneDelegate = AppDelegate.shared?.activeSceneDelegate,
       let window = sceneDelegate.window
-    else { return }
+    else {
+      self.theme.value = newTheme
+      return
+    }
 
     let newTheme = SimpleTheme(with: newTheme, useDarkVariant: self.useDarkVariant)
     UIView.transition(with: window,