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

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin
2025-11-14 12:48:06 +04:00
parent f91fbff773 441b4ccc9f
commit 0e1b60be24
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_number_offset
View File

@@ -1 +1 @@
2600
2620

11
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/LiveChatReactionStreamView.swift
View File

@@ -9,6 +9,7 @@ import AccountContext
import HierarchyTrackingLayer
import LokiRng
import SwiftSignalKit
import TelegramPresentationData
private let gradientColors: [NSArray] = [
[UIColor(rgb: 0xff516a).cgColor, UIColor(rgb: 0xff885e).cgColor],
@@ -93,15 +94,17 @@ private func avatarViewLettersImage(size: CGSize, peerId: EnginePeer.Id, letters
}
private func makePeerBadgeImage(engine: TelegramEngine, peer: EnginePeer, count: Int) async -> UIImage {
let count = 123
let avatarSize: CGFloat = 16.0
let avatarInset: CGFloat = 2.0
let avatarIconSpacing: CGFloat = 2.0
let iconTextSpacing: CGFloat = 1.0
let iconSize: CGFloat = 10.0
let rightInset: CGFloat = 2.0
let rightInset: CGFloat = 5.0
let text = NSAttributedString(string: "\(count)", font: Font.semibold(10.0), textColor: .white)
var textSize = text.boundingRect(with: CGSize(width: 100.0, height: 100.0), options: .usesLineFragmentOrigin, context: nil).size
let text = NSAttributedString(string: countString(Int64(count)), font: Font.semibold(10.0), textColor: .white)
var textSize = text.boundingRect(with: CGSize(width: 200.0, height: 100.0), options: .usesLineFragmentOrigin, context: nil).size
textSize.width = ceil(textSize.width)
textSize.height = ceil(textSize.height)
@@ -127,7 +130,7 @@ private func makePeerBadgeImage(engine: TelegramEngine, peer: EnginePeer, count:
disposable.dispose()
}
let size = CGSize(width: avatarInset + avatarSize + avatarIconSpacing + iconSize + iconTextSpacing + textSize.height + rightInset, height: avatarSize + avatarInset * 2.0)
let size = CGSize(width: avatarInset + avatarSize + avatarIconSpacing + iconSize + iconTextSpacing + textSize.width + rightInset, height: avatarSize + avatarInset * 2.0)
return generateImage(size, rotatedContext: { size, context in
UIGraphicsPushContext(context)
defer {

12
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift
View File

@@ -3028,11 +3028,13 @@ public final class StoryItemSetContainerComponent: Component {
}
var sendAsPeer: SendAsPeer?
if let currentSendAsPeer = self.sendMessageContext.currentSendAsPeer {
sendAsPeer = currentSendAsPeer
} else {
sendAsPeer = liveChatStateValue.defaultSendAs.flatMap { defaultSendAs in
return self.sendMessageContext.sendAsData?.availablePeers.first(where: { $0.peer.id == defaultSendAs })
if let sendAsData = self.sendMessageContext.sendAsData, sendAsData.availablePeers.count > 1 {
if let currentSendAsPeer = self.sendMessageContext.currentSendAsPeer {
sendAsPeer = currentSendAsPeer
} else {
sendAsPeer = liveChatStateValue.defaultSendAs.flatMap { defaultSendAs in
return self.sendMessageContext.sendAsData?.availablePeers.first(where: { $0.peer.id == defaultSendAs })
}
}
}