ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-03 13:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve poll results expansion

Browse Source
This commit is contained in:
Ali 2020-01-17 13:20:58 +04:00
parent 479689bc1a
commit f788a5a0c1
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
submodules/TelegramUI/TelegramUI/PollResultsController.swift
View File

@ -155,7 +155,7 @@ private enum PollResultsEntry: ItemListNodeEntry {
}
private struct PollResultsControllerState: Equatable {
var expandedOptions = Set<Data>()
var expandedOptions: [Data: Int] = [:]
}
private func pollResultsControllerEntries(presentationData: PresentationData, poll: TelegramMediaPoll, state: PollResultsControllerState, resultsState: PollResultsState) -> [PollResultsEntry] {
@ -215,28 +215,40 @@ private func pollResultsControllerEntries(presentationData: PresentationData, po
} else {
if let optionState = resultsState.options[option.opaqueIdentifier], !optionState.peers.isEmpty {
var hasMore = false
let optionExpanded = state.expandedOptions.contains(option.opaqueIdentifier)
let optionExpandedAtCount = state.expandedOptions[option.opaqueIdentifier]
let peers = optionState.peers
let count = optionState.count
let displayCount: Int
if peers.count > collapsedInitialLimit {
displayCount = collapsedResultCount
} else {
if optionState.isLoadingMore && peers.count <= collapsedInitialLimit + 1 {
displayCount = collapsedResultCount
} else {
if peers.count > collapsedInitialLimit + 1 {
if optionExpandedAtCount != nil {
displayCount = peers.count
} else {
displayCount = collapsedResultCount
}
} else {
if let optionExpandedAtCount = optionExpandedAtCount {
if optionExpandedAtCount == collapsedInitialLimit + 1 && optionState.canLoadMore {
displayCount = collapsedResultCount
} else {
displayCount = peers.count
}
} else {
if !optionState.canLoadMore {
displayCount = peers.count
} else {
displayCount = collapsedResultCount
}
}
}
var peerIndex = 0
inner: for peer in peers {
if !optionExpanded && peerIndex >= displayCount {
if peerIndex >= displayCount {
break inner
}
entries.append(.optionPeer(optionId: i, index: peerIndex, peer: peer, optionText: optionTextHeader, optionCount: Int32(count), optionExpanded: optionExpanded, opaqueIdentifier: option.opaqueIdentifier, shimmeringAlternation: nil, isFirstInOption: peerIndex == 0))
entries.append(.optionPeer(optionId: i, index: peerIndex, peer: peer, optionText: optionTextHeader, optionCount: Int32(count), optionExpanded: optionExpandedAtCount != nil, opaqueIdentifier: option.opaqueIdentifier, shimmeringAlternation: nil, isFirstInOption: peerIndex == 0))
peerIndex += 1
}
@ -269,19 +281,20 @@ public func pollResultsController(context: AccountContext, messageId: MessageId,
collapseOption: { optionId in
updateState { state in
var state = state
state.expandedOptions.remove(optionId)
state.expandedOptions.removeValue(forKey: optionId)
return state
}
}, expandOption: { optionId in
updateState { state in
var state = state
state.expandedOptions.insert(optionId)
return state
}
let _ = (resultsContext.state
|> take(1)
|> deliverOnMainQueue).start(next: { [weak resultsContext] state in
if let optionState = state.options[optionId] {
updateState { state in
var state = state
state.expandedOptions[optionId] = optionState.peers.count
return state
}
if optionState.canLoadMore {
resultsContext?.loadMore(optionOpaqueIdentifier: optionId)
}