diff --git a/Shared/ArticleStyles/ArticleThemesManager.swift b/Shared/ArticleStyles/ArticleThemesManager.swift index 6e9690972..d11540c9d 100644 --- a/Shared/ArticleStyles/ArticleThemesManager.swift +++ b/Shared/ArticleStyles/ArticleThemesManager.swift @@ -140,11 +140,10 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging, Observable } catch { logger.error("\(error.localizedDescription)") } - } } - func themesByDeveloper() -> ([ArticleTheme], [ArticleTheme]) { + func themesByDeveloper() -> (builtIn: [ArticleTheme], other: [ArticleTheme]) { let installedProvidedThemes = themeNames.map({ try? articleThemeWithThemeName($0) }).compactMap({ $0 }).filter({ $0.isAppTheme }).sorted(by: { $0.name < $1.name }).filter({ $0.name != AppDefaults.defaultThemeName }) let installedOtherThemes = themeNames.map({ try? articleThemeWithThemeName($0) }).compactMap({ $0 }).filter({ !$0.isAppTheme }).sorted(by: { $0.name < $1.name }) @@ -173,7 +172,7 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging, Observable let installedThemes = ArticleThemesManager.shared.themesByDeveloper() - for theme in installedThemes.0 { + for theme in installedThemes.builtIn { let item = NSMenuItem() item.title = theme.name item.action = #selector(updateThemeSelection(_:)) @@ -189,7 +188,7 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging, Observable thirdPartyHeading.isEnabled = false menu.addItem(thirdPartyHeading) - for theme in installedThemes.1 { + for theme in installedThemes.other { let item = NSMenuItem() item.title = theme.name item.action = #selector(updateThemeSelection(_:)) diff --git a/iOS/Settings/Appearance/ArticleThemeManagerView.swift b/iOS/Settings/Appearance/ArticleThemeManagerView.swift index c83f37841..b2c411eae 100644 --- a/iOS/Settings/Appearance/ArticleThemeManagerView.swift +++ b/iOS/Settings/Appearance/ArticleThemeManagerView.swift @@ -21,13 +21,13 @@ struct ArticleThemeManagerView: View { Form { Section(header: Text("Built-in Themes", comment: "Section header for installed themes"), footer: Text("These themes cannot be deleted.", comment: "Section footer for installed themes.")) { articleThemeRow(try! themeManager.articleThemeWithThemeName(AppDefaults.defaultThemeName)) - ForEach(0..