Skip to content

Commit 536ca99

Browse files
authored
Show pinned channels at the top in the demo app (#731)
1 parent 7e2a185 commit 536ca99

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

DemoAppSwiftUI/ChannelHeader/ChannelListQueryIdentifier.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ enum ChannelListQueryIdentifier: String, CaseIterable, Identifiable {
99
case initial
1010
case archived
1111
case pinned
12-
case unarchivedAndPinnedSorted
1312

1413
var id: String {
1514
rawValue
@@ -20,7 +19,6 @@ enum ChannelListQueryIdentifier: String, CaseIterable, Identifiable {
2019
case .initial: "Initial Channels"
2120
case .archived: "Archived Channels"
2221
case .pinned: "Pinned Channels"
23-
case .unarchivedAndPinnedSorted: "Sort by Pinned and Ignore Archived Channels"
2422
}
2523
}
2624
}

DemoAppSwiftUI/DemoAppSwiftUIApp.swift

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,11 @@ extension AppState {
149149
switch identifier {
150150
case .initial:
151151
return ChannelListQuery(
152-
filter: .containMembers(userIds: [currentUserId])
153-
)
154-
case .unarchivedAndPinnedSorted:
155-
return ChannelListQuery(
156-
filter: .and([
157-
.containMembers(userIds: [currentUserId]),
158-
.equal(.archived, to: false)
159-
]),
152+
filter: .containMembers(userIds: [currentUserId]),
160153
sort: [
161-
.init(key: .pinnedAt, isAscending: false),
162-
.init(key: .default)
154+
Sorting(key: .pinnedAt),
155+
Sorting(key: .lastMessageAt),
156+
Sorting(key: .createdAt)
163157
]
164158
)
165159
case .archived:

0 commit comments

Comments
 (0)