Skip to content
This repository was archived by the owner on Mar 7, 2026. It is now read-only.

Commit bbe8a2f

Browse files
authored
Fix A-Z sorting and remove expand/collapse buttons
1 parent 9fe573c commit bbe8a2f

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

Sources/prostore/views/AppsView.swift

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ final class RepoViewModel: ObservableObject {
191191
let sorted: [CachedApp]
192192
switch sort {
193193
case .nameAZ:
194-
sorted = filtered.sorted { $0.nameLower < $1.nameLower }
194+
sorted = filtered.sorted { a, b in let pa = (a.nameLower.first?.isLetter == true ? 0 : a.nameLower.first?.isNumber == true ? 1 : a.nameLower.first?.isPunctuation == true || a.nameLower.first?.isSymbol == true ? 2 : 3); let pb = (b.nameLower.first?.isLetter == true ? 0 : b.nameLower.first?.isNumber == true ? 1 : b.nameLower.first?.isPunctuation == true || b.nameLower.first?.isSymbol == true ? 2 : 3); pa != pb ? pa < pb : a.nameLower < b.nameLower }
195195
case .nameZA:
196-
sorted = filtered.sorted { $0.nameLower > $1.nameLower }
196+
sorted = filtered.sorted { a, b in let pa = (a.nameLower.first?.isLetter == true ? 0 : a.nameLower.first?.isNumber == true ? 1 : a.nameLower.first?.isPunctuation == true || a.nameLower.first?.isSymbol == true ? 2 : 3); let pb = (b.nameLower.first?.isLetter == true ? 0 : b.nameLower.first?.isNumber == true ? 1 : b.nameLower.first?.isPunctuation == true || b.nameLower.first?.isSymbol == true ? 2 : 3); pa != pb ? pa < pb : a.nameLower > b.nameLower }
197197
case .repoAZ:
198198
// sort by repo then name
199199
sorted = filtered.sorted {
@@ -648,16 +648,6 @@ public struct AppsView: View {
648648
Button(action: { vm.refresh() }) {
649649
Image(systemName: "arrow.clockwise")
650650
}
651-
Button(action: {
652-
withAnimation(.spring()) { expandedRepos = Set(orderedRepoKeys) }
653-
}) {
654-
Image(systemName: "rectangle.expand.vertical")
655-
}
656-
Button(action: {
657-
withAnimation(.spring()) { expandedRepos.removeAll() }
658-
}) {
659-
Image(systemName: "rectangle.compress.vertical")
660-
}
661651
}
662652
}
663653
.onAppear {

0 commit comments

Comments
 (0)