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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2020-10-19 12:54:46 +04:00
parent b44f3d62eb
commit b074831fd3
14 changed files with 764 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
submodules/LocationUI/Sources/LocationViewControllerNode.swift
View File

@@ -42,7 +42,7 @@ private struct LocationViewTransaction {
private enum LocationViewEntryId: Hashable {
case info
case toggleLiveLocation
case liveLocation(PeerId)
case liveLocation(UInt32)
}
private enum LocationViewEntry: Comparable, Identifiable {
@@ -57,11 +57,7 @@ private enum LocationViewEntry: Comparable, Identifiable {
case .toggleLiveLocation:
return .toggleLiveLocation
case let .liveLocation(_, message, _, _):
if let author = message.author {
return .liveLocation(author.id)
} else {
return .liveLocation(message.id.peerId)
}
return .liveLocation(message.stableId)
}
}
@@ -379,7 +375,7 @@ final class LocationViewControllerNode: ViewControllerTracingNode, CLLocationMan
var effectiveSubject: Message?
for message in effectiveLiveLocations {
if message.id.peerId == subject.id.peerId {
if message.id == subject.id {
effectiveSubject = message
} else {
sortedLiveLocations.append(message)
@@ -408,9 +404,9 @@ final class LocationViewControllerNode: ViewControllerTracingNode, CLLocationMan
entries.append(.liveLocation(presentationData.theme, message, distance, index))
if message.localTags.contains(.OutgoingLiveLocation), let selfPeer = selfPeer {
userAnnotation = LocationPinAnnotation(context: context, theme: presentationData.theme, message: message, selfPeer: selfPeer, heading: nil)
userAnnotation = LocationPinAnnotation(context: context, theme: presentationData.theme, message: message, selfPeer: selfPeer, heading: location.heading)
} else {
annotations.append(LocationPinAnnotation(context: context, theme: presentationData.theme, message: message, selfPeer: nil, heading: nil))
annotations.append(LocationPinAnnotation(context: context, theme: presentationData.theme, message: message, selfPeer: selfPeer, heading: location.heading))
}
index += 1
}