diff options
| author | Fuwn <[email protected]> | 2025-02-22 00:28:09 -0800 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2025-02-22 00:28:09 -0800 |
| commit | 7b470cd80eea4b4ef72a3ca8726b8a72a58b01ee (patch) | |
| tree | f76b65f0ca2152ce17200506e7971edd2f5a52ac /Sora/Views | |
| parent | feat: Development commit (diff) | |
| download | sora-testing-7b470cd80eea4b4ef72a3ca8726b8a72a58b01ee.tar.xz sora-testing-7b470cd80eea4b4ef72a3ca8726b8a72a58b01ee.zip | |
feat: Development commit
Diffstat (limited to 'Sora/Views')
| -rw-r--r-- | Sora/Views/Bookmarks/BookmarksView.swift | 7 | ||||
| -rw-r--r-- | Sora/Views/Post/PostGridBookmarkButtonView.swift | 22 | ||||
| -rw-r--r-- | Sora/Views/SearchSuggestionsView.swift | 4 | ||||
| -rw-r--r-- | Sora/Views/Settings/SettingsThumbnailsView.swift | 2 |
4 files changed, 20 insertions, 15 deletions
diff --git a/Sora/Views/Bookmarks/BookmarksView.swift b/Sora/Views/Bookmarks/BookmarksView.swift index b36ee45..b52e7b7 100644 --- a/Sora/Views/Bookmarks/BookmarksView.swift +++ b/Sora/Views/Bookmarks/BookmarksView.swift @@ -12,8 +12,8 @@ struct BookmarksView: View { } return settings.bookmarks - .filter { - $0.tags.joined(separator: " ").lowercased().contains(bookmarksSearchText.lowercased()) + .filter { bookmark in + bookmark.tags.joined(separator: " ").lowercased().contains(bookmarksSearchText.lowercased()) } } @@ -24,7 +24,8 @@ struct BookmarksView: View { ContentUnavailableView( "No Bookmarks", systemImage: "bookmark", - description: Text("Add a bookmark by tapping the bookmark button on a search page.")) + description: Text("Add a bookmark by tapping the bookmark button on a search page.") + ) } else { List { if filteredBookmarks.isEmpty, !bookmarksSearchText.isEmpty { diff --git a/Sora/Views/Post/PostGridBookmarkButtonView.swift b/Sora/Views/Post/PostGridBookmarkButtonView.swift index a25b24f..9f85a20 100644 --- a/Sora/Views/Post/PostGridBookmarkButtonView.swift +++ b/Sora/Views/Post/PostGridBookmarkButtonView.swift @@ -5,10 +5,12 @@ struct PostGridBookmarkButtonView: View { @EnvironmentObject private var settings: Settings var contained: Bool { - settings.bookmarks - .contains { - $0.tags == manager.tags.map { $0.lowercased() } - && $0.provider == manager.provider ?? settings.preferredBooru + let lowercaseTags = manager.tags.map { $0.lowercased() } + + return settings.bookmarks + .contains { bookmark in + bookmark.tags == lowercaseTags + && bookmark.provider == manager.provider ?? settings.preferredBooru } } @@ -23,11 +25,13 @@ struct PostGridBookmarkButtonView: View { provider: manager.provider ?? settings.preferredBooru, tags: manager.tags ) - }) { - Label( - "Bookmark", - systemImage: - contained ? "bookmark.fill" : "bookmark") } + ) { + Label( + "Bookmark", + systemImage: + contained ? "bookmark.fill" : "bookmark" + ) + } } } diff --git a/Sora/Views/SearchSuggestionsView.swift b/Sora/Views/SearchSuggestionsView.swift index 91f1f77..34ccfbc 100644 --- a/Sora/Views/SearchSuggestionsView.swift +++ b/Sora/Views/SearchSuggestionsView.swift @@ -9,8 +9,8 @@ struct SearchSuggestionsView: View { var body: some View { ForEach( - tags.filter { - $0.name.lowercased().contains(lastSearchTag) + tags.filter { tag in + tag.name.lowercased().contains(lastSearchTag) } ) { suggestion in Button { diff --git a/Sora/Views/Settings/SettingsThumbnailsView.swift b/Sora/Views/Settings/SettingsThumbnailsView.swift index 6631987..f787e59 100644 --- a/Sora/Views/Settings/SettingsThumbnailsView.swift +++ b/Sora/Views/Settings/SettingsThumbnailsView.swift @@ -12,7 +12,7 @@ struct SettingsThumbnailsView: View { #if os(macOS) Picker("Thumbnail Columns", selection: $settings.columns) { - ForEach(1...10, id: \.self) { i in Text("\(i)") } + ForEach(1...10, id: \.self) { columns in Text("\(columns)") } } #else Stepper( |