From 2f1f673afe0b24e1f49393a55846570f41fa5fb6 Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuart.breckenridge@icloud.com>
Date: Sat, 12 Nov 2022 14:46:42 +0800
Subject: [PATCH] Fixes #3739 - Theme menu updates after selection

---
 Mac/MainWindow/MainWindowController.swift | 4 ++--
 iOS/Article/ArticleViewController.swift   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index 64dd77e59..a2292ab5e 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -1434,7 +1434,7 @@ private extension MainWindowController {
 		let defaultThemeItem = NSMenuItem()
 		defaultThemeItem.title = ArticleTheme.defaultTheme.name
 		defaultThemeItem.action = #selector(selectArticleTheme(_:))
-		defaultThemeItem.state = defaultThemeItem.title == ArticleThemesManager.shared.currentThemeName ? .on : .off
+		defaultThemeItem.state = defaultThemeItem.title == ArticleThemesManager.shared.currentTheme.name ? .on : .off
 		articleThemeMenu.addItem(defaultThemeItem)
 
 		articleThemeMenu.addItem(NSMenuItem.separator())
@@ -1443,7 +1443,7 @@ private extension MainWindowController {
 			let themeItem = NSMenuItem()
 			themeItem.title = themeName
 			themeItem.action = #selector(selectArticleTheme(_:))
-			themeItem.state = themeItem.title == ArticleThemesManager.shared.currentThemeName ? .on : .off
+			themeItem.state = themeItem.title == ArticleThemesManager.shared.currentTheme.name ? .on : .off
 			articleThemeMenu.addItem(themeItem)
 		}
 
diff --git a/iOS/Article/ArticleViewController.swift b/iOS/Article/ArticleViewController.swift
index a12370ba6..b76ece0ba 100644
--- a/iOS/Article/ArticleViewController.swift
+++ b/iOS/Article/ArticleViewController.swift
@@ -11,8 +11,9 @@ import WebKit
 import Account
 import Articles
 import SafariServices
+import RSCore
 
-class ArticleViewController: UIViewController, MainControllerIdentifiable {
+class ArticleViewController: UIViewController, MainControllerIdentifiable, Logging {
 	
 	typealias State = (extractedArticle: ExtractedArticle?,
 					   isShowingExtractedArticle: Bool,
@@ -259,7 +260,7 @@ class ArticleViewController: UIViewController, MainControllerIdentifiable {
 								  identifier: nil,
 								  discoverabilityTitle: nil,
 								  attributes: [],
-								  state: ArticleThemesManager.shared.currentThemeName == themeName ? .on : .off,
+								  state: ArticleThemesManager.shared.currentTheme.name == themeName ? .on : .off,
 								  handler: { action in
 				ArticleThemesManager.shared.currentThemeName = themeName
 			})
@@ -271,7 +272,7 @@ class ArticleViewController: UIViewController, MainControllerIdentifiable {
 										  identifier: nil,
 										  discoverabilityTitle: nil,
 										  attributes: [],
-										  state: ArticleThemesManager.shared.currentThemeName == AppDefaults.defaultThemeName ? .on : .off,
+										  state: ArticleThemesManager.shared.currentTheme.name == AppDefaults.defaultThemeName ? .on : .off,
 										  handler: { _ in
 			ArticleThemesManager.shared.currentThemeName = AppDefaults.defaultThemeName
 		})