diff options
Diffstat (limited to 'Sora')
| -rw-r--r-- | Sora/Views/BookmarkMenuButtonView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/FavoriteMenuButtonView.swift | 6 | ||||
| -rw-r--r-- | Sora/Views/FavoritesView.swift | 14 | ||||
| -rw-r--r-- | Sora/Views/Generic/GenericListView.swift | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/Sora/Views/BookmarkMenuButtonView.swift b/Sora/Views/BookmarkMenuButtonView.swift index 0d61b9d..5e737ff 100644 --- a/Sora/Views/BookmarkMenuButtonView.swift +++ b/Sora/Views/BookmarkMenuButtonView.swift @@ -34,7 +34,7 @@ struct BookmarkMenuButtonView: View { ForEach(topLevelFolders.keys.sorted(), id: \.self) { topLevelName in Menu { - let topLevelFolder = settings.folders.first(where: { $0.name == topLevelName }) + let topLevelFolder = settings.folders.first { $0.name == topLevelName } if let topLevelFolder { Button(action: { diff --git a/Sora/Views/FavoriteMenuButtonView.swift b/Sora/Views/FavoriteMenuButtonView.swift index ce442e2..5cfecbd 100644 --- a/Sora/Views/FavoriteMenuButtonView.swift +++ b/Sora/Views/FavoriteMenuButtonView.swift @@ -32,11 +32,13 @@ struct FavoriteMenuButtonView: View { ForEach(topLevelFolders.keys.sorted(), id: \.self) { topLevelName in Menu { - let topLevelFolder = settings.folders.first(where: { $0.name == topLevelName }) + let topLevelFolder = settings.folders.first { $0.name == topLevelName } if let topLevelFolder { Button(action: { - settings.addFavorite(post: post, provider: manager.provider, folder: topLevelFolder.id) + settings.addFavorite( + post: post, provider: manager.provider, folder: topLevelFolder.id + ) }) { Text("Uncategorized") } diff --git a/Sora/Views/FavoritesView.swift b/Sora/Views/FavoritesView.swift index 30fb2e0..3974215 100644 --- a/Sora/Views/FavoritesView.swift +++ b/Sora/Views/FavoritesView.swift @@ -277,13 +277,13 @@ struct FavoritesView: View { // swiftlint:disable:this type_body_length Label("All \(topLevelName)", systemImage: "folder.fill") } - if settings.folders.contains(where: { $0.name == topLevelName }) { - Button(action: { - selectedCollectionOption = .topLevelUncategorized(topLevelName) - }) { - Label("Uncategorized", systemImage: "folder.badge.questionmark") - } + if settings.folders.contains(where: { $0.name == topLevelName }) { + Button(action: { + selectedCollectionOption = .topLevelUncategorized(topLevelName) + }) { + Label("Uncategorized", systemImage: "folder.badge.questionmark") } + } Divider() @@ -558,7 +558,7 @@ struct FavoritesView: View { // swiftlint:disable:this type_body_length ForEach(topLevelFolders.keys.sorted(), id: \.self) { topLevelName in Menu { - let topLevelFolder = settings.folders.first(where: { $0.name == topLevelName }) + let topLevelFolder = settings.folders.first { $0.name == topLevelName } if let topLevelFolder { Button(action: { diff --git a/Sora/Views/Generic/GenericListView.swift b/Sora/Views/Generic/GenericListView.swift index 79d4142..bf2a6aa 100644 --- a/Sora/Views/Generic/GenericListView.swift +++ b/Sora/Views/Generic/GenericListView.swift @@ -470,7 +470,7 @@ struct GenericListView<T: Identifiable & Hashable & GenericItem>: View { ForEach(topLevelFolders.keys.sorted(), id: \.self) { topLevelName in Menu { - let topLevelFolder = settings.folders.first(where: { $0.name == topLevelName }) + let topLevelFolder = settings.folders.first { $0.name == topLevelName } if let topLevelFolder { Button(action: { |