Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add a sortedLabels computed property on LinkedItem

Browse Source
This commit is contained in:
Satindar Dhillon
2022-05-05 20:32:50 -07:00
parent da9af1e05a
commit 2f4f24dd6b
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apple/OmnivoreKit/Sources/App/Views/Labels/LabelsViewModel.swift
View File

@ -22,7 +22,7 @@ import Views
dataService.viewContext.performAndWait {
self.labels = labelIDs.compactMap { dataService.viewContext.object(with: $0) as? LinkedItemLabel }
}
let selLabels = initiallySelectedLabels ?? item?.labels.asArray(of: LinkedItemLabel.self) ?? []
let selLabels = initiallySelectedLabels ?? item?.sortedLabels ?? []
for label in labels {
if selLabels.contains(label) {
selectedLabels.append(label)

6
apple/OmnivoreKit/Sources/Models/DataModels/FeedItem.swift
View File

@ -58,6 +58,12 @@ public extension LinkedItem {
return URL(string: pageURLString ?? "")
}
var sortedLabels: [LinkedItemLabel] {
labels.asArray(of: LinkedItemLabel.self).sorted {
($0.name ?? "").lowercased() < ($1.name ?? "").lowercased()
}
}
var labelsJSONString: String {
let labels = self.labels.asArray(of: LinkedItemLabel.self).map { label in
[

2
apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift
View File

@ -151,7 +151,7 @@ public struct GridCard: View {
// Category Labels
ScrollView(.horizontal, showsIndicators: false) {
HStack {
ForEach(item.labels.asArray(of: LinkedItemLabel.self), id: \.self) {
ForEach(item.sortedLabels, id: \.self) {
TextChip(feedItemLabel: $0)
}
Spacer()

2
apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift
View File

@ -67,7 +67,7 @@ public struct FeedCard: View {
// Category Labels
ScrollView(.horizontal, showsIndicators: false) {
HStack {
ForEach(item.labels.asArray(of: LinkedItemLabel.self), id: \.self) {
ForEach(item.sortedLabels, id: \.self) {
TextChip(feedItemLabel: $0)
}
Spacer()