renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Provides visible separation of Ranchero themes

Browse Source 
This commit provides visible separation of first and third party themes with a clear indicator that first party themes cannot be deleted.
This commit is contained in:
Stuart Breckenridge
2022-12-22 06:45:54 +08:00
parent 577e7562ee
commit 269359f88c
1 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
iOS/Settings/Appearance/ArticleThemeManagerView.swift
View File

@@ -16,17 +16,29 @@ struct ArticleThemeManagerView: View {
@State private var showImportConfirmationAlert: (ArticleTheme?, Bool) = (nil, false)
@State private var showImportErrorAlert: (Error?, Bool) = (nil, false)
@State private var showImportSuccessAlert: Bool = false
@State private var installedFirstPartyThemes: [ArticleTheme] = []
@State private var installedThirdPartyThemes: [ArticleTheme] = []
var body: some View {
Form {
Section(header: Text("Installed Themes", comment: "Section header for installed themes")) {
articleThemeRow("Default")
ForEach(themeManager.themeNames, id: \.self) {theme in
articleThemeRow(theme)
Section(header: Text("Ranchero Software Themes", comment: "Section header for installed themes"), footer: Text("These themes cannot be deleted.", comment: "Section footer for installed themes.")) {
articleThemeRow(try! themeManager.articleThemeWithThemeName("Default"))
ForEach(0..<installedFirstPartyThemes.count, id: \.self) { i in
articleThemeRow(installedFirstPartyThemes[i])
}
}
Section(header: Text("Third Party Themes", comment: "Section header for third party themes")) {
ForEach(0..<installedThirdPartyThemes.count, id: \.self) { i in
articleThemeRow(installedThirdPartyThemes[i])
}
}
}
.navigationTitle(Text("Article Themes", comment: "Navigation bar title for Article Themes"))
.task {
updateThemesArrays()
}
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
Button {
@@ -136,24 +148,25 @@ struct ArticleThemeManagerView: View {
}, message: {
Text("\(showImportErrorAlert.0?.localizedDescription ?? "")")
})
.onReceive(themeManager.objectWillChange) { _ in
updateThemesArrays()
}
}
func articleThemeRow(_ theme: String) -> some View {
func articleThemeRow(_ theme: ArticleTheme) -> some View {
Button {
themeManager.currentThemeName = theme
themeManager.currentThemeName = theme.name
} label: {
HStack {
VStack(alignment: .leading) {
Text(theme)
Text(theme.name)
.foregroundColor(.primary)
if let articleTheme = try? themeManager.articleThemeWithThemeName(theme) {
Text("Created by \(articleTheme.creatorName)", comment: "Article theme creator byline.")
.font(.caption)
.foregroundColor(.secondary)
}
Text("Created by \(theme.creatorName)", comment: "Article theme creator byline.")
.font(.caption)
.foregroundColor(.secondary)
}
Spacer()
if themeManager.currentThemeName == theme {
if themeManager.currentThemeName == theme.name {
Image(systemName: "checkmark")
.foregroundColor(Color(uiColor: AppAssets.primaryAccentColor))
}
@@ -161,20 +174,25 @@ struct ArticleThemeManagerView: View {
}
.swipeActions(edge: .trailing, allowsFullSwipe: false) {
if theme == themeManager.currentThemeName { }
if let currentTheme = try? themeManager.articleThemeWithThemeName(theme) {
if currentTheme.isAppTheme { } else {
Button {
showDeleteConfirmation = (theme, true)
} label: {
Text("Delete", comment: "Button title")
Image(systemName: "trash")
}
.tint(.red)
if theme.isAppTheme || theme.name == themeManager.currentThemeName {
} else {
Button {
showDeleteConfirmation = (theme.name, true)
} label: {
Text("Delete", comment: "Button title")
Image(systemName: "trash")
}
.tint(.red)
}
}
}
private func updateThemesArrays() {
installedFirstPartyThemes = themeManager.themeNames.map({ try? themeManager.articleThemeWithThemeName($0) }).compactMap({ $0 }).filter({ $0.isAppTheme }).sorted(by: { $0.name < $1.name })
installedThirdPartyThemes = themeManager.themeNames.map({ try? themeManager.articleThemeWithThemeName($0) }).compactMap({ $0 }).filter({ !$0.isAppTheme }).sorted(by: { $0.name < $1.name })
}
}
struct ArticleThemeImporterView_Previews: PreviewProvider {