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

Voice Chat UI fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2020-12-09 18:03:11 +04:00
parent 693cae73f2
commit 41e4c7f835
2 changed files with 7 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
submodules/TelegramBaseController/Sources/TelegramBaseController.swift
View File

@ -270,7 +270,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
return lhs?.internalId == rhs?.internalId return lhs?.internalId == rhs?.internalId
}) })
|> map { call -> PresentationGroupCall? in |> map { call -> PresentationGroupCall? in
guard let call = call, call.peerId == peerId else { guard let call = call, call.peerId == peerId && call.account.peerId == context.account.peerId else {
return nil return nil
} }
return call return call
@ -312,78 +312,6 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
} }
} }
|> runOn(.mainQueue()) |> runOn(.mainQueue())
/*let updatedData: Signal<GroupCallPanelData?, NoError> = getGroupCallParticipants(account: context.account, callId: activeCall.id, accessHash: activeCall.accessHash, offset: "", limit: 10)
|> map(Optional.init)
|> `catch` { _ -> Signal<GroupCallParticipantsContext.State?, NoError> in
return .single(nil)
}
|> mapToSignal { initialState -> Signal<GroupCallPanelData?, NoError> in
guard let initialState = initialState else {
return .single(nil)
}
return Signal<GroupCallPanelData?, NoError> { subscriber in
let participantsContext = QueueLocalObject<GroupCallParticipantsContext>(queue: .mainQueue(), generate: {
return GroupCallParticipantsContext(
account: context.account,
peerId: peerId,
id: activeCall.id,
accessHash: activeCall.accessHash,
state: initialState
)
})
let disposable = MetaDisposable()
participantsContext.with { participantsContext in
disposable.set(combineLatest(queue: .mainQueue(),
participantsContext.state,
participantsContext.numberOfActiveSpeakers
).start(next: { state, numberOfActiveSpeakers in
var topParticipants: [GroupCallParticipantsContext.Participant] = []
for participant in state.participants {
if topParticipants.count >= 3 {
break
}
topParticipants.append(participant)
}
let data = GroupCallPanelData(
peerId: peerId,
info: GroupCallInfo(id: activeCall.id, accessHash: activeCall.accessHash, participantCount: state.totalCount, clientParams: nil),
topParticipants: topParticipants,
participantCount: state.totalCount,
numberOfActiveSpeakers: numberOfActiveSpeakers,
groupCall: nil
)
subscriber.putNext(data)
}))
}
return ActionDisposable {
disposable.dispose()
participantsContext.with { _ in
}
}
}
|> runOn(.mainQueue())
}
let initialData: Signal<GroupCallPanelData?, NoError> = .single(GroupCallPanelData(
peerId: peerId,
info: GroupCallInfo(
id: activeCall.id,
accessHash: activeCall.accessHash,
participantCount: 0,
clientParams: nil
),
topParticipants: [],
participantCount: 0,
numberOfActiveSpeakers: 0,
groupCall: nil
))
return initialData
|> then(updatedData)*/
} }
} else { } else {
availableGroupCall = .single(nil) availableGroupCall = .single(nil)

10
submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift
View File

@ -548,8 +548,10 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
} else { } else {
let initialScale: CGFloat = ((self.maskGradientLayer.value(forKeyPath: "presentationLayer.transform.scale.x") as? NSNumber)?.floatValue).flatMap({ CGFloat($0) }) ?? (((self.maskGradientLayer.value(forKeyPath: "transform.scale.x") as? NSNumber)?.floatValue).flatMap({ CGFloat($0) }) ?? (0.89)) let initialScale: CGFloat = ((self.maskGradientLayer.value(forKeyPath: "presentationLayer.transform.scale.x") as? NSNumber)?.floatValue).flatMap({ CGFloat($0) }) ?? (((self.maskGradientLayer.value(forKeyPath: "transform.scale.x") as? NSNumber)?.floatValue).flatMap({ CGFloat($0) }) ?? (0.89))
let targetScale: CGFloat = self.isActive ? 0.89 : 0.85 let targetScale: CGFloat = self.isActive ? 0.89 : 0.85
self.maskGradientLayer.transform = CATransform3DMakeScale(targetScale, targetScale, 1.0) if abs(targetScale - initialScale) > 0.03 {
self.maskGradientLayer.animateScale(from: initialScale, to: targetScale, duration: 0.3) self.maskGradientLayer.transform = CATransform3DMakeScale(targetScale, targetScale, 1.0)
self.maskGradientLayer.animateScale(from: initialScale, to: targetScale, duration: 0.3)
}
} }
} }
@ -566,11 +568,11 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
if active { if active {
targetColors = [blue.cgColor, green.cgColor] targetColors = [blue.cgColor, green.cgColor]
targetScale = 0.89 targetScale = 0.89
outerColor = UIColor(rgb: 0x005720) outerColor = UIColor(rgb: 0x21674f)
} else { } else {
targetColors = [lightBlue.cgColor, blue.cgColor] targetColors = [lightBlue.cgColor, blue.cgColor]
targetScale = 0.85 targetScale = 0.85
outerColor = UIColor(rgb: 0x00274d) outerColor = UIColor(rgb: 0x1d588d)
} }
} else { } else {
targetColors = [lightBlue.cgColor, blue.cgColor] targetColors = [lightBlue.cgColor, blue.cgColor]