From f4bdf8f090c627561789a5e49a4aa046a24a81a9 Mon Sep 17 00:00:00 2001 From: LEEYOONJONG Date: Tue, 6 Dec 2022 17:13:08 +0900 Subject: [PATCH] =?UTF-8?q?#160=20feat:=20=EC=A0=80=EC=9E=A5=EB=90=9C=20?= =?UTF-8?q?=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EA=B0=92=EC=9D=84=20=EA=B8=B0=EB=B0=98=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B7=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Segno/Segno/Application/SceneDelegate.swift | 6 ++++++ .../SettingsViewController.swift | 18 +++--------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Segno/Segno/Application/SceneDelegate.swift b/Segno/Segno/Application/SceneDelegate.swift index a60dffe..d483b1c 100644 --- a/Segno/Segno/Application/SceneDelegate.swift +++ b/Segno/Segno/Application/SceneDelegate.swift @@ -19,6 +19,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { let navigationController = UINavigationController() coordinator = AppCoordinator(navigationController) coordinator?.start() + setDarkMode() window?.rootViewController = navigationController window?.makeKeyAndVisible() @@ -29,5 +30,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { func sceneWillResignActive(_ scene: UIScene) { } func sceneWillEnterForeground(_ scene: UIScene) { } func sceneDidEnterBackground(_ scene: UIScene) { } + + private func setDarkMode() { + let mode = DarkModeManager.shared.getDarkMode() + DarkModeManager.shared.changeDarkMode(to: mode) + } } diff --git a/Segno/Segno/Presentation/ViewController/SettingsViewController.swift b/Segno/Segno/Presentation/ViewController/SettingsViewController.swift index 353452f..be7a060 100644 --- a/Segno/Segno/Presentation/ViewController/SettingsViewController.swift +++ b/Segno/Segno/Presentation/ViewController/SettingsViewController.swift @@ -129,27 +129,15 @@ final class SettingsViewController: UIViewController { let actionSheet = UIAlertController(title: Metric.darkModeSettingString, message: nil, preferredStyle: .actionSheet) actionSheet.addAction(UIAlertAction(title: DarkMode.system.title, style: .default, handler: { _ in self.viewModel.changeDarkMode(to: DarkMode.system.rawValue) - .subscribe(onSuccess: { mode in - self.view.window?.overrideUserInterfaceStyle = UIUserInterfaceStyle(rawValue: mode) ?? .unspecified - cell.configure(right: DarkMode.system.title) - }) - .disposed(by: self.disposeBag) + cell.configure(right: DarkMode.system.title) })) actionSheet.addAction(UIAlertAction(title: DarkMode.light.title, style: .default, handler: { _ in self.viewModel.changeDarkMode(to: DarkMode.light.rawValue) - .subscribe(onSuccess: { mode in - self.view.window?.overrideUserInterfaceStyle = UIUserInterfaceStyle(rawValue: mode) ?? .unspecified - cell.configure(right: DarkMode.light.title) - }) - .disposed(by: self.disposeBag) + cell.configure(right: DarkMode.light.title) })) actionSheet.addAction(UIAlertAction(title: DarkMode.dark.title, style: .default, handler: { _ in self.viewModel.changeDarkMode(to: DarkMode.dark.rawValue) - .subscribe(onSuccess: { mode in - self.view.window?.overrideUserInterfaceStyle = UIUserInterfaceStyle(rawValue: mode) ?? .unspecified - cell.configure(right: DarkMode.dark.title) - }) - .disposed(by: self.disposeBag) + cell.configure(right: DarkMode.dark.title) })) actionSheet.addAction(UIAlertAction(title: Metric.cancelMessage , style: .cancel, handler: { _ in